[ros-diffs] [fireball] 31616: - Merge 31498 (include define guard fix).