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