Merge remote-tracking branch 'origin/electric_dev' into groovy_dev
Merge branch 'groovy_dev' of git://github.com/ipa320/cob_driver into groovy_dev
timing big fix