Feature cherry picking master bad merges

These commits were merged in via pull requests (#1, #2, and #3) into `master`. This pulls them into the `release` ( and then `stable`) branch.