Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 18:10:36 +0000 (13:10 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Nov 2015 18:10:36 +0000 (13:10 -0500)

Trivial merge