IF and ROS
Merge commit 'c04121f'
Merge branch 'master' into stabilize