commit 20141007
Merge branch 'dev_thinkpad'

* dev_thinkpad:
  commit 20141007