1.16.1

Closed May 16, 2018 100% complete