Merge remote-tracking branch 'origin/hjl/linux/master' into hjl/linux/applied