Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160923' into staging