Merge branch 'hotfix/1.1.5' v1.1.5
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:02:00 +0000 (16:02 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 18 Mar 2016 20:02:00 +0000 (16:02 -0400)

Trivial merge