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

This reverts commit 8f7ff4a2729db286a84c030f5510a64da5f18c67.
Rebase from 'upstream'
Trimmed the branch to only the jsk_ros_patch/image_view2 sub directory