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