Merge branch 'hotfix/1.1.5'
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:44:35 +0000 (13:44 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 17:44:35 +0000 (13:44 -0400)

Trivial merge