merge issue 46, which suppresses javascripty cross-linking of place type in place pages