Pulling in martijn's commit to resolve merge conflict