Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 13:38:18 +0000 (09:38 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 13:38:18 +0000 (09:38 -0400)

Trivial merge