Merge branch 'thinkpad-devel' into master-devel