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