Fix over-zealous Google Preview linking.
Merge branch 'release-2.3'