Merge branch 'hotfix/1.1.1' v1.1.1
authorAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Feb 2016 16:31:34 +0000 (11:31 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Wed, 3 Feb 2016 16:31:34 +0000 (11:31 -0500)

Trivial merge