Merge branch 'release-2.140.101' 2.140.101
authorChris Koeritz <fred@gruntose.com>
Sat, 18 Nov 2017 02:43:53 +0000 (21:43 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 18 Nov 2017 02:43:53 +0000 (21:43 -0500)
commit2c725838e22747dd922163daf376ea2b81395c5e
treeb3dc8e4b1c51b6bd0cb2d08bd3b5ae82556e20e9
parent8e20bdec7d1ec50d9886c77aa6317b6317594cd5
parent1a30a72e7f211dc0a5fe81a74a322d5041a64d25
Merge branch 'release-2.140.101'

bringing in the dev branch's changes.