7.16
Merge remote-tracking branch 'upstream/master'
07.13, 07.16, cleanup
Merge pull request #9 from mikem5/master

07.13 and 07.16