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