build.xml now knows about /Global
Merge branch '1.8.1'