Release 26

Closed Nov 30, 2016 100% complete