Merge branches 'mips-fixes' and 'mips-next'