Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 21:57:30 +0000 (16:57 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 23 Jan 2017 21:57:30 +0000 (16:57 -0500)

Trivial merge