Merge branch 'hotfix/1.1.21' v1.1.21
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:27:01 +0000 (14:27 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 12 Sep 2016 18:27:01 +0000 (14:27 -0400)

Trivial merge