Merge branch 'master' into camera-nodelets
Merge branch 'camera-nodelets' of https://github.com/RIVeR-Lab/aero into camera-nodelets