Change-Id: Ifd4f60a96856d15993efd857d33421f691bb8824 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>