alspec-s6 merged and rebased.