Release 2.9 Bugfixing (develop)

This is the develop pull for Pull #324.  I'm merging it myself since its already been brought into release/2.9