Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 20:27:53 +0000 (16:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 20 Apr 2015 20:27:53 +0000 (16:27 -0400)

Trivial merge