last commit on 20140921 with thinkpad.
Merge branch 'dev_thinkpad'