Change-Id: I2cd3a13aca4012dadc73d909ff73135eb487cd82 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>