Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jan 2019 21:37:45 +0000 (16:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 29 Jan 2019 21:37:45 +0000 (16:37 -0500)

Trivial merge