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