1. 1c0fa2a merged from asterix_stabilization for r1113:1117 by jarodwen ยท 12 years ago