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