Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release