Manual merging of pull request #28