Change-Id: Iad0ee5e39553c9cb778bfd5673378af84063f4af Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>