Merge branch 'hotfix/1.1.10' v1.1.10
authorAnthony Talarico <talarico@gaslightmedia.com>
Tue, 22 Mar 2016 20:09:48 +0000 (16:09 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Tue, 22 Mar 2016 20:09:48 +0000 (16:09 -0400)

Trivial merge