Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Aug 2017 16:54:08 +0000 (12:54 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Aug 2017 16:54:08 +0000 (12:54 -0400)

Trivial merge