(bug 5239) Fixed undefined journal issue
Merge pull request #556 from anall/feature/bug5239

(bug 5239) Fixed undefined journal issue
(Bug 5147) Remove stray file bin/upgrading/deadphrases.dat.orig

Looks like this accidentally crept in.
Merge pull request #557 from kareila/bug5147-origfile

(Bug 5147) Remove stray file bin/upgrading/deadphrases.dat.orig