Merge branch 'hotfix/1.1.2' v1.1.2
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 19:30:00 +0000 (15:30 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 5 Aug 2016 19:30:00 +0000 (15:30 -0400)

Trivial merge