Merge branch 'pr/152' into release-candidates/rc-5.90116
Jay Hannah [Tue, 16 Jan 2018 22:41:17 +0000 (16:41 -0600)]

Trivial merge