Merge branch 'hotfix/1.1.9' v1.1.9
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 15:35:46 +0000 (11:35 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 11 Aug 2016 15:35:46 +0000 (11:35 -0400)

Trivial merge