Merge branch 'hotfix/1.0.15' v1.0.15
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 22:18:44 +0000 (17:18 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 22:18:44 +0000 (17:18 -0500)

Trivial merge