Merge branch 'hotfix/1.1.11' v1.1.11
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Mar 2017 15:28:38 +0000 (11:28 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Mar 2017 15:28:38 +0000 (11:28 -0400)

Trivial merge