Manual merge for 0c3e51963b5803d66443e71554d3e06a296805b3 in pull request #269.