Add recent changes from master Bugzilla branch.