[ros-diffs] [cfinck] 33371: Same fix for libpng