Merge branch 'hotfix/2.10.9' v2.10.9
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 25 Aug 2017 14:38:27 +0000 (10:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 25 Aug 2017 14:38:27 +0000 (10:38 -0400)

Trivial merge