Release 3.3

Closed Jul 11, 2018 100% complete