Merge branch 'hotfix/2.10.1' v2.10.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Jul 2017 13:40:08 +0000 (09:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 26 Jul 2017 13:40:08 +0000 (09:40 -0400)

Trivial merge