Merge branch 'release-2.140.100' 2.140.100
authorChris Koeritz <fred@gruntose.com>
Thu, 16 Nov 2017 14:44:06 +0000 (09:44 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 16 Nov 2017 14:44:06 +0000 (09:44 -0500)
merging in from development branch to create 2.140.100


Trivial merge