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