Merge branch 'hotfix/1.1.6'
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 14:06:03 +0000 (10:06 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 20 Sep 2016 14:06:03 +0000 (10:06 -0400)

Trivial merge