#257142: Conflicting branches have been merged. This version does not significantly change functionality as it just incorporates previous changes from the stable branch, but it fixes coding style and adds an update path for users upgrading from a version of DHTML Menu that still clones menu blocks (pre 6.x-1.04).