Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Feb 2018 16:52:36 +0000 (11:52 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Feb 2018 16:52:36 +0000 (11:52 -0500)

Trivial merge