Merge branch 'hotfix/1.0.6' v1.0.6
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Sep 2015 16:35:33 +0000 (12:35 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 16 Sep 2015 16:35:33 +0000 (12:35 -0400)

Trivial merge