Merge branch 'release-2.140.94' into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 06:03:40 +0000 (01:03 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 06:03:40 +0000 (01:03 -0500)
grabbing crucial fix to be able to spin a new release


Trivial merge