Added changes from bugzilla.