Bug 1104925: followup to fix tests, r+a=me
merge beta to mozilla-release, a=merge