Merge branch 'master' of github.com:ros-perception/calibration