Merge branch 'release/1.0.6' v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Dec 2017 19:41:11 +0000 (14:41 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Dec 2017 19:41:11 +0000 (14:41 -0500)

Trivial merge