Change-Id: I6124c12a269093fbd54cbbbb47b4d7f15ffaae2f Reviewed-by: Eike Ziller <eike.ziller@digia.com>