Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:03:02 +0000 (15:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 May 2015 19:03:02 +0000 (15:03 -0400)

Trivial merge