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