Merge branch 'hotfix/1.0.7' v1.0.7
authorChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Jul 2015 21:10:18 +0000 (17:10 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Wed, 22 Jul 2015 21:10:18 +0000 (17:10 -0400)

Trivial merge