Merge branch 'hotfix/1.1.10' v1.1.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Mar 2017 15:23:01 +0000 (11:23 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 20 Mar 2017 15:23:01 +0000 (11:23 -0400)

Trivial merge