Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Mar 2015 21:53:06 +0000 (16:53 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Mar 2015 21:53:06 +0000 (16:53 -0500)

Trivial merge