Merge branch 'hotfix/1.1.5' v1.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:10:52 +0000 (10:10 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 2 Feb 2017 15:10:52 +0000 (10:10 -0500)

Trivial merge