Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 14:53:33 +0000 (10:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 27 Oct 2016 14:53:33 +0000 (10:53 -0400)

Trivial merge