Sync master into develop

The efficacy of using `sprinter_develop.cfg` is somewhat diminished when fixes originate in `master` and don't make it into `develop`.