finish merging of recent fixes to live (phase2 branch) into phase2b (dev branch)
finish merging of recent fixes to live (phase2 branch) into phase2b (dev branch)

DOAJ/doaj,DOAJ/doaj,DOAJ/doaj,DOAJ/doaj