Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Oct 2015 15:26:34 +0000 (11:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 5 Oct 2015 15:26:34 +0000 (11:26 -0400)

Trivial merge