Made compatible with current globalize trunk
Merge pull request #1 from RSpace/master

Please pull my fix