Changing deprecated PLUGINLIB_DECLARE_CLASS to PLUGINLIB_EXPORT_CLASS
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'