Merge branch 'ErwinJanssen-various-changes'
authorJohn Ellson <john.ellson@comcast.net>
Sat, 8 Oct 2016 16:00:52 +0000 (12:00 -0400)
committerJohn Ellson <john.ellson@comcast.net>
Sat, 8 Oct 2016 16:00:52 +0000 (12:00 -0400)

Trivial merge