Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jul 2016 13:39:07 +0000 (09:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jul 2016 13:39:07 +0000 (09:39 -0400)

Trivial merge