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