Merge branch 'release-2.140.109' into dev
authorChris Koeritz <fred@gruntose.com>
Tue, 20 Feb 2018 16:00:28 +0000 (11:00 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 20 Feb 2018 16:00:28 +0000 (11:00 -0500)
updating dev branch from latest release


Trivial merge