Merge branch 'hotfix/1.1.10' v1.1.10
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:00:50 +0000 (12:00 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 16:00:50 +0000 (12:00 -0400)

Trivial merge