Update master to 2.8

Big merge.