Merge branch 'lairdm-master'
John Napiorkowski [Tue, 5 Dec 2017 15:02:36 +0000 (10:02 -0500)]

Trivial merge