Backport Everything 1.1
by samfortyseven