Change-Id: Ib2aa41d6a059246e15d1f42831bdec96c235161e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>