Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:50:50 +0000 (14:50 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:50:50 +0000 (14:50 -0400)

Trivial merge