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