Fix merge errors in pull #827.