Manual merge for 0c3e51963b5803d66443e71554d3e06a296805b3 in pull request #269.
Manual merge of 4e3826228d43321abec7805f65b6d43d0f04ab06 in #269.