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