Merge branch 'jegade-master'
John Napiorkowski [Mon, 19 Dec 2016 15:07:26 +0000 (09:07 -0600)]

Trivial merge