Merge from matt-nb5-mips64
branches: 1.1.2;file list64 was initially added on branch matt-nb5-mips64.