merge-phrases adapted to handle other than 'serial correctly
Merge branch 'experimental' into master