Merge branch 'release-2.140.92' into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 21:10:06 +0000 (16:10 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 21:10:06 +0000 (16:10 -0500)
commit54b61896e2d220b282a3ad77148aec5cd9484fcb
tree3107ed73b8a32d8d9e3eb4516dd618e922bf7466
parentafff950f497547f99b9df6287c6227868b5cfa3f
parent8312dbd6829564ff2136b356966a66e60387e8cd
Merge branch 'release-2.140.92' into dev

getting fixes from release branch into dev branch