Merge develop to release-0.11

Bunch 'o stuff.  Seems to be working well; push it out for a week's worth of testing!