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

Trivial merge