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