Merge branch 'hotfix/2.10.2' v2.10.2
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Aug 2017 19:46:00 +0000 (15:46 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 7 Aug 2017 19:46:00 +0000 (15:46 -0400)

Trivial merge