Merge branch 'hotfix/1.1.9'
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Jun 2016 19:14:59 +0000 (15:14 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 8 Jun 2016 19:14:59 +0000 (15:14 -0400)

Trivial merge