It is time to merge the ea1254 branch into master...

After this, the contents of the ea1254 and master branches are identical.