Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Apr 2017 15:42:54 +0000 (11:42 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 24 Apr 2017 15:42:54 +0000 (11:42 -0400)

Trivial merge