Bug1018349 coalesce max sort

@selenamarie this might shake out if you `git pull --rebase mozilla master` on your branch