Merge branch 'release/1.0.0' v1.0.0
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 15 May 2017 16:23:03 +0000 (12:23 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 15 May 2017 16:23:03 +0000 (12:23 -0400)

Trivial merge