Merge branch 'hotfix/1.0.6' master v1.0.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 15:59:59 +0000 (11:59 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 May 2017 15:59:59 +0000 (11:59 -0400)

Trivial merge