Merge branch 'hotfix/1.6.6' v1.6.6
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 17 Jan 2017 18:12:03 +0000 (13:12 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 17 Jan 2017 18:12:03 +0000 (13:12 -0500)

Trivial merge