Merge branch 'hotfix/1.0.1' master v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:35:55 +0000 (15:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 19:35:55 +0000 (15:35 -0400)

Trivial merge