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