Merge commit '342187d6e7ce34d4fdf403952637659b93aa4bee' into py3