Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 16:27:15 +0000 (12:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 16:27:15 +0000 (12:27 -0400)

Trivial merge