2.0.0 M1

Closed May 10, 2017 100% complete