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