merge latest jsk_travis