Merge branch 'hotfix/2.10.18' v2.10.18
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 15:31:30 +0000 (10:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 15:31:30 +0000 (10:31 -0500)

Trivial merge