Rebase from 'upstream' (no changes)
Trimmed the branch to only the jsk_ros_patch/collada_urdf_jsk_patch sub directory
Revert "Trimmed the branch to only the jsk_ros_patch/collada_urdf_jsk_patch sub directory"

This reverts commit beb6c70424b1306d3d7d5371a0c20eeef3b114fb.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/collada_urdf_jsk_patch sub directory