Cherry-picks from trunk
Major PDB data structure change: consolidation
Merge branch 'refs/heads/master' into pdb-format-overhaul

Conflicts:
	lib/address.rb