Merge branch 'hotfix/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Jun 2016 17:19:40 +0000 (13:19 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 27 Jun 2016 17:19:40 +0000 (13:19 -0400)

Trivial merge