Change-Id: I2df37576f2bfda58d571e707c8b05c630848b769
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>

Change-Id: Id7a20353887bf50b7e39d5797fbaf31d2663921d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>