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

Trivial merge