Silence a -Wformat-extra-argument warning when compiling.
null merge from 3.2 (3.3's code already refactored)
null merge from 3.3