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

This reverts commit 29787572521cf30dabb09f751da27ab0e9cfe303.
Rebase from 'upstream'
Trimmed the branch to only the jsk_gui_msgs sub directory