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