Merge branch/2014-04-22/condemn into the master sources.
Fix amsss.