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