Merge remote-tracking branch 'origin/master' into kernel-4.14