Merge branch 'release-2.140.109' 2.140.109
authorChris Koeritz <fred@gruntose.com>
Tue, 20 Feb 2018 15:58:01 +0000 (10:58 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 20 Feb 2018 15:58:01 +0000 (10:58 -0500)
updates from dev branch for new release


Trivial merge