Merge r1853761 from trunk: * r1853761 Fix an "unused static function" warning in non-maintainer mode builds. Justification: Requested on dev@. Fixes a compiler warning. Votes: +1: danielsh, brane, stsp