Release/2.9

So I wasn't expecting this. There are still items in release/2.9 that were not merged into develop.

Possibly because Geoff's copy of the release/2.9 branch were before I merged in the recent changes in the Apache24 branch.

I'll let this sit for a few hours but I think someone can pull this into develop to complete the synchronization process.

(previous version was mistakenly submitted to master -- that has been closed -- this is the intended pull request).