Merge2.7

This is a pull from 2.7 into develop to keep things up to date.  Rudimentary testing didn't find anything really broken.