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