Remove references to ArenaAlign from the design.
Merge branch/2014-06-10/amc-extend-by in the master sources.