Merge branch 'hotfix/1.0.1'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 16:36:12 +0000 (11:36 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 16 Nov 2015 16:36:12 +0000 (11:36 -0500)

Trivial merge