Merge branch 'hotfix/1.0.5' v1.0.5
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:53:31 +0000 (12:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 16:53:31 +0000 (12:53 -0400)

Trivial merge