Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Aug 2016 13:41:46 +0000 (09:41 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Aug 2016 13:41:46 +0000 (09:41 -0400)

Trivial merge