Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Apr 2018 18:47:25 +0000 (14:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Apr 2018 18:47:25 +0000 (14:47 -0400)

Trivial merge