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