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