Change-Id: I2d2481e2f1a3e0f2d4a5807712e9435b3009e52d Reviewed-by: Marco Bubke <marco.bubke@digia.com>