Merge correct Migrate branch.
More fixes.
Merge branch 'overhaul' into bibtex