Merge development branch into master

So doing this on GitHub involves using the pull request mechanism.  Had to actually look that up.

This will sync up the master and development branches.