Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 14:44:20 +0000 (09:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 14:44:20 +0000 (09:44 -0500)

Trivial merge