Support journal abbreviations

Continuation of #146, now into 3.1 branch