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