Merge branch 'hotfix/2.10.20' v2.10.20
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 18:32:44 +0000 (13:32 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 9 Nov 2017 18:32:44 +0000 (13:32 -0500)

Trivial merge