Merge branch 'release/1.0.20' v1.0.20
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Sep 2017 15:39:25 +0000 (11:39 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Sep 2017 15:39:25 +0000 (11:39 -0400)

Trivial merge