1.18.1

Closed Jul 26, 2018 100% complete