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