9.1.6

Closed Jul 20, 2017 100% complete

Fix regressions in 9.1.5