Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:04:02 +0000 (09:04 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 13:04:02 +0000 (09:04 -0400)

Trivial merge