No bug - merge bustage fix on a CLOSED TREE. r=bustage