Release 31

Closed Feb 2, 2017 100% complete