1.18.0

Closed Jul 11, 2018 100% complete