Rolling up changes to production from staging 2016-03-31 Release

Rolling up changes to production from staging 2016-03-24 Release

Production deploy tag for March 18 2016

Production deploy tag for March 10 2016