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