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