Merge branch 'hotfix/1.0.7' v1.0.7
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:12:10 +0000 (15:12 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 12 Jan 2016 20:12:10 +0000 (15:12 -0500)

Trivial merge