Change-Id: I398a9e46fd9c4beacd9e8554dab544154e48b870 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>