Merge branch 'release/1.0.1' master v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Apr 2017 19:35:32 +0000 (15:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 14 Apr 2017 19:35:32 +0000 (15:35 -0400)

Trivial merge