*** Bug 1082450 has been marked as a duplicate of this bug. ***
Ready for QA once package has been created.
Martin, the changes look good. Changing to VERIFIED.