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