No bug, Automated blocklist update from host bld-linux64-ec2-634 - a=blocklist-update
Backout part of Bug 812179 for SeaMonkey bustage. rs+=gps
Merge central to inbound