These functions have been around for a while, but commits 48b5aa3 and15afb7d were only back-patched to v16. Any objections if I apply them downto v13 now?
-- nathan