diff --git a/recipes-ros/diagnostics/diagnostic-aggregator_1.8.2.bb b/recipes-ros/diagnostics/diagnostic-aggregator_1.8.3.bb
similarity index 100%
rename from recipes-ros/diagnostics/diagnostic-aggregator_1.8.2.bb
rename to recipes-ros/diagnostics/diagnostic-aggregator_1.8.3.bb
diff --git a/recipes-ros/diagnostics/diagnostic-analysis_1.8.2.bb b/recipes-ros/diagnostics/diagnostic-analysis_1.8.3.bb
similarity index 100%
rename from recipes-ros/diagnostics/diagnostic-analysis_1.8.2.bb
rename to recipes-ros/diagnostics/diagnostic-analysis_1.8.3.bb
diff --git a/recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.2.bb b/recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.3.bb
similarity index 100%
rename from recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.2.bb
rename to recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.3.bb
diff --git a/recipes-ros/diagnostics/diagnostic-updater_1.8.2.bb b/recipes-ros/diagnostics/diagnostic-updater_1.8.3.bb
similarity index 100%
rename from recipes-ros/diagnostics/diagnostic-updater_1.8.2.bb
rename to recipes-ros/diagnostics/diagnostic-updater_1.8.3.bb
diff --git a/recipes-ros/diagnostics/diagnostics.inc b/recipes-ros/diagnostics/diagnostics.inc
index f527b3b25907acd8b37b358f0f6696e0487d48e1..37870cd4c38284a816147ba5447c1519efa2af56 100644
--- a/recipes-ros/diagnostics/diagnostics.inc
+++ b/recipes-ros/diagnostics/diagnostics.inc
@@ -1,6 +1,6 @@
 SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "84abf8a66c09e061b93f087a9f7d8560"
-SRC_URI[sha256sum] = "2f4e4fd1351afdc8e0469730030566b03bd3f7308904ddf7593d3cf98797515d"
+SRC_URI[md5sum] = "253985d33cf4e1ca745bdeeab79cbde3"
+SRC_URI[sha256sum] = "9053c54762e22e90590c93fddfcd5d38214d3e5af1b7301aa7bdb7e21b82025c"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
diff --git a/recipes-ros/image-pipeline/camera-calibration_1.11.8.bb b/recipes-ros/image-pipeline/camera-calibration_1.11.9.bb
similarity index 100%
rename from recipes-ros/image-pipeline/camera-calibration_1.11.8.bb
rename to recipes-ros/image-pipeline/camera-calibration_1.11.9.bb
diff --git a/recipes-ros/image-pipeline/depth-image-proc_1.11.8.bb b/recipes-ros/image-pipeline/depth-image-proc_1.11.9.bb
similarity index 100%
rename from recipes-ros/image-pipeline/depth-image-proc_1.11.8.bb
rename to recipes-ros/image-pipeline/depth-image-proc_1.11.9.bb
diff --git a/recipes-ros/image-pipeline/image-pipeline.inc b/recipes-ros/image-pipeline/image-pipeline.inc
index 41d5ea944f203d30416175a37f521e97a04fbfd2..c925482c653faffd60b24174b9a4c3b341b2d8a1 100644
--- a/recipes-ros/image-pipeline/image-pipeline.inc
+++ b/recipes-ros/image-pipeline/image-pipeline.inc
@@ -1,6 +1,6 @@
 SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "f3e4bb2e48e45d3414d7e08e109e8d1b"
-SRC_URI[sha256sum] = "dea2425dadfe9315eceacbc8d49cdd8a19f4eb79bd95c030c2c8d261e04b5060"
+SRC_URI[md5sum] = "6bdf2392670501dae0c582c9a2310258"
+SRC_URI[sha256sum] = "91f4b2e0d5794917d535a149d08127438e0432496accdbb5c4a97cf495bbd010"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
diff --git a/recipes-ros/image-pipeline/image-proc_1.11.8.bb b/recipes-ros/image-pipeline/image-proc_1.11.9.bb
similarity index 100%
rename from recipes-ros/image-pipeline/image-proc_1.11.8.bb
rename to recipes-ros/image-pipeline/image-proc_1.11.9.bb
diff --git a/recipes-ros/image-pipeline/image-rotate_1.11.8.bb b/recipes-ros/image-pipeline/image-rotate_1.11.9.bb
similarity index 100%
rename from recipes-ros/image-pipeline/image-rotate_1.11.8.bb
rename to recipes-ros/image-pipeline/image-rotate_1.11.9.bb
diff --git a/recipes-ros/image-pipeline/image-view_1.11.8.bb b/recipes-ros/image-pipeline/image-view_1.11.9.bb
similarity index 100%
rename from recipes-ros/image-pipeline/image-view_1.11.8.bb
rename to recipes-ros/image-pipeline/image-view_1.11.9.bb
diff --git a/recipes-ros/image-pipeline/stereo-image-proc_1.11.8.bb b/recipes-ros/image-pipeline/stereo-image-proc_1.11.9.bb
similarity index 100%
rename from recipes-ros/image-pipeline/stereo-image-proc_1.11.8.bb
rename to recipes-ros/image-pipeline/stereo-image-proc_1.11.9.bb
diff --git a/recipes-ros/octomap-ros/octomap-ros_0.3.0.bb b/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb
similarity index 74%
rename from recipes-ros/octomap-ros/octomap-ros_0.3.0.bb
rename to recipes-ros/octomap-ros/octomap-ros_0.3.1.bb
index d7f11358ad07681076820584e7ee17fb8918f41b..ca4cd818128ba85a0c9177a3e286a6afa95567c1 100644
--- a/recipes-ros/octomap-ros/octomap-ros_0.3.0.bb
+++ b/recipes-ros/octomap-ros/octomap-ros_0.3.1.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "octomap_ros provides conversion functions between ROS / PCL and OctoMap's native types."
 SECTION = "devel"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "octomap-msgs octomap pcl-ros sensor-msgs tf"
 
 SRC_URI = "https://github.com/OctoMap/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "bb532a09683512adb2f5d6ce6589914f"
-SRC_URI[sha256sum] = "0a43b252916905eca03b893211d9fc1f031480909a5fde8a2d904f7d408bde10"
+SRC_URI[md5sum] = "eb831d70d2cfe0589e58ecbebb5b5637"
+SRC_URI[sha256sum] = "63803af415840fd4adcea5888f6a330f061800541142eeb0fe2075971dc5c3b3"
 
 S = "${WORKDIR}/${ROS_SP}"
 
diff --git a/recipes-ros/pcl-conversions/pcl-conversions_0.1.5.bb b/recipes-ros/pcl-conversions/pcl-conversions_0.1.6.bb
similarity index 73%
rename from recipes-ros/pcl-conversions/pcl-conversions_0.1.5.bb
rename to recipes-ros/pcl-conversions/pcl-conversions_0.1.6.bb
index 0351a3fd9b79208fb9afb7a75a555d4f88d48ec4..a4ff18bb8062d453cca029d3854ad823e8c1bc2c 100644
--- a/recipes-ros/pcl-conversions/pcl-conversions_0.1.5.bb
+++ b/recipes-ros/pcl-conversions/pcl-conversions_0.1.6.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc
 DEPENDS = "pcl-msgs pcl"
 
 SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "1cfba274d55c7e09d98ec8509240a682"
-SRC_URI[sha256sum] = "9ac20bb51248e5c39f5aeccfaabbf2ed0a42130871f52f134dfcdfa03dac00ec"
+SRC_URI[md5sum] = "a4317447dbd3da2bcd33d40db700b723"
+SRC_URI[sha256sum] = "5664ef3877de7efed7215bb9320fad02d1c167a96f3ba8927727e607a5f6285c"
 
 S = "${WORKDIR}/${ROS_SP}"
 
diff --git a/recipes-ros/perception-pcl/pcl-ros_1.1.7.bb b/recipes-ros/perception-pcl/pcl-ros_1.1.8.bb
similarity index 68%
rename from recipes-ros/perception-pcl/pcl-ros_1.1.7.bb
rename to recipes-ros/perception-pcl/pcl-ros_1.1.8.bb
index fafef2f93ae7d0a77fb5dad91aafc7d084e1fa0b..9cb9a9a8787f7a5a7cd5ce8917bc45cd098965c3 100644
--- a/recipes-ros/perception-pcl/pcl-ros_1.1.7.bb
+++ b/recipes-ros/perception-pcl/pcl-ros_1.1.8.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "PCL (Point Cloud Library) ROS interface stack"
 SECTION = "devel"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=19;endline=19;md5=d566ef916e9dedc494f5f793a6690ba5"
 
 DEPENDS = "dynamic-reconfigure nodelet nodelet-topic-tools message-filters tf rosbag pcl pcl-conversions"
 
 SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "a42887c8923e439c7bed0b07e33be0fc"
-SRC_URI[sha256sum] = "2a1b47e9dd478440abe4e03403fe83e314fbcfdbac7d65676a2cad1b7a2b1765"
+SRC_URI[md5sum] = "32bba867a1b41d2c40921719be0ecde8"
+SRC_URI[sha256sum] = "d918d1e04dbbeb0aa7aa4097081ae542280f3645e04d1d1ed74f5396a67ddb1f"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
diff --git a/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch b/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
index 2789f3d6666460b40bce7784b77e00c90a3f77a1..9a8a7cdec160b180186e298d3aaaffa14b389fb6 100644
--- a/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
+++ b/recipes-ros/ros-tutorials/rospy-tutorials/0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch
@@ -3,7 +3,7 @@ From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
 Date: Tue, 4 Feb 2014 16:07:10 +0100
 Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
 
-Upstream-Status: Submitted
+Upstream-Status: Backport [Accepted in indigo-devel branch]
 ---
  rospy_tutorials/CMakeLists.txt | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-ros/roslint/roslint_0.9.2.bb b/recipes-ros/roslint/roslint_0.9.2.bb
new file mode 100644
index 0000000000000000000000000000000000000000..64c0eb2838a3a69af9ee7684e4eb7d04ac96e6ee
--- /dev/null
+++ b/recipes-ros/roslint/roslint_0.9.2.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "CMake lint commands for ROS packages"
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "7f71adcdf0d8ffcc726e443ffe548bdd"
+SRC_URI[sha256sum] = "b1a77e8d3a2ee3a065f9d6aea11867650facda40263feda6451d581aa7696049"
+
+S = "${WORKDIR}/${ROS_SP}"
+
+inherit catkin
diff --git a/recipes-ros/vision-opencv/cv-bridge_1.10.15.bb b/recipes-ros/vision-opencv/cv-bridge_1.10.17.bb
similarity index 100%
rename from recipes-ros/vision-opencv/cv-bridge_1.10.15.bb
rename to recipes-ros/vision-opencv/cv-bridge_1.10.17.bb
diff --git a/recipes-ros/vision-opencv/image-geometry_1.10.15.bb b/recipes-ros/vision-opencv/image-geometry_1.10.17.bb
similarity index 100%
rename from recipes-ros/vision-opencv/image-geometry_1.10.15.bb
rename to recipes-ros/vision-opencv/image-geometry_1.10.17.bb
diff --git a/recipes-ros/vision-opencv/vision-opencv.inc b/recipes-ros/vision-opencv/vision-opencv.inc
index 142ab658fdf06f9e9ce8be4f4344aab1aaf604b8..b08f3561ad6bc54fac8440d66c0d69b3c0cd6f24 100644
--- a/recipes-ros/vision-opencv/vision-opencv.inc
+++ b/recipes-ros/vision-opencv/vision-opencv.inc
@@ -1,6 +1,6 @@
 SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "f2fdc9299ca0b6507137df185f9b5553"
-SRC_URI[sha256sum] = "c4934eee07961e194143885751c919137baf77a08d40013dd903da50dfd60b9b"
+SRC_URI[md5sum] = "f622ca8ec2a85f5d854e06d0b64fc627"
+SRC_URI[sha256sum] = "4e94b2087cad13f48534163f36bae47db1e09b388032f35e7e8eae270514719a"
 
 S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
diff --git a/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
deleted file mode 100644
index de44af7a3baf1b70e36c5cdbb0b90acb3c8d7ae7..0000000000000000000000000000000000000000
--- a/recipes-ros/xacro/xacro/0001-check-for-CATKIN_ENABLE_TESTING.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1a534325ce98bd1250c3f586b243c85a0515fcac Mon Sep 17 00:00:00 2001
-From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Sat, 12 Oct 2013 11:14:26 +0200
-Subject: [PATCH] check for CATKIN_ENABLE_TESTING
-
-Upstream-Status: Accepted
----
- CMakeLists.txt | 6 ++++--
- package.xml    | 2 +-
- 2 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d67593..f68faa8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,5 +16,7 @@ install(PROGRAMS xacro.py DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
- 
- install(PROGRAMS scripts/xacro DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
- 
--## Add folders to be run by python nosetests
--catkin_add_nosetests(test)
-+if(CATKIN_ENABLE_TESTING)
-+  ## Add folders to be run by python nosetests
-+  catkin_add_nosetests(test)
-+endif()
-diff --git a/package.xml b/package.xml
-index 69cb9e7..26f61e2 100644
---- a/package.xml
-+++ b/package.xml
-@@ -17,7 +17,7 @@
- 
-   <author>Stuart Glaser</author>
- 
--  <buildtool_depend>catkin</buildtool_depend>
-+  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
- 
-   <run_depend>roslaunch</run_depend>
- 
--- 
-1.8.1.2
-
diff --git a/recipes-ros/xacro/xacro_1.8.4.bb b/recipes-ros/xacro/xacro_1.8.5.bb
similarity index 59%
rename from recipes-ros/xacro/xacro_1.8.4.bb
rename to recipes-ros/xacro/xacro_1.8.5.bb
index 95893d9697cad6a0707f51b370b4663c87dfed5d..ac2db56482ff28d2c3240eb4c7b728bcb06057a6 100644
--- a/recipes-ros/xacro/xacro_1.8.4.bb
+++ b/recipes-ros/xacro/xacro_1.8.5.bb
@@ -3,10 +3,10 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
-SRC_URI[md5sum] = "32848b03f52b6a4b4040ccc4634c13ce"
-SRC_URI[sha256sum] = "44f7190cecab31ab67460d40c7872d99fe89907fad20106dbf5205f33ba54718"
+DEPENDS = "roslint"
 
-SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "0ab54d837509adc0579eacae4f27d8b6"
+SRC_URI[sha256sum] = "bcb0c5706a7da913431d49478b795667b32c7f7dee28639024b267e022ffc25a"
 
 inherit catkin