Merge branch 'hotfix/2.10.19' v2.10.19
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 15:58:21 +0000 (10:58 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 15:58:21 +0000 (10:58 -0500)

Trivial merge