Merge branch 'hotfix/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 14:56:05 +0000 (10:56 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 13 Oct 2016 14:56:05 +0000 (10:56 -0400)

Trivial merge