Change-Id: I5c76f8af720092d4e47b1a9fa889fb3a7010f21f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>