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