merge r292034 to 4.0.1
This looks like it will break the ABI. New 'const' versions of the functions need to be added instead of changing the existing functions (like what was done for the Iterator class). Can you attach an updated patch?
I tweaked it to not remove the old functions and merged in r301479.