Merge pull request #1958 from sergey-safarov/mips