Merge commit '93aa048ca43f57ece6a68de309fd786311da1cf7' into HEAD

...without the CHANGELOG.rst updates
Merge branch 'indigo' into catkin