Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
Merge branch 'sanritz'
update mycpu method
update
Merge branch 'master' into sanritz