Merge branch 'thinkpad' into test