Merge branch 'release/1.0.1' v1.0.1
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Jan 2017 14:15:26 +0000 (09:15 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Jan 2017 14:15:26 +0000 (09:15 -0500)

Trivial merge