Merge branch 'release/1.0.6' master v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Sep 2017 18:49:39 +0000 (14:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Sep 2017 18:49:39 +0000 (14:49 -0400)

Trivial merge