Merge mps/branch/2014-04-08/align into the master sources.