Merge branch 'hotfix/2.10.17' v2.10.17
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Nov 2017 18:51:05 +0000 (14:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 1 Nov 2017 18:51:05 +0000 (14:51 -0400)

Trivial merge