Merge branch 'hotfix/1.1.7' v1.1.7
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 15:07:00 +0000 (11:07 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 8 Jul 2016 15:07:00 +0000 (11:07 -0400)

Trivial merge