Develop

18e7d920aaeb9b95325067350a30e4dc16f926fd is 5e2d0221a19eae54a3f367ed8fbfd3bf6e880889 merged from master to develop.  somehow it was left out.

my plan had been to generate separate pull requests for that and cb3826090081a715a55ff49a52741418a37b6faa, but github only presents me with the option to make the pull request when i compare master and develop, not master and a specific commit on develop.