Merge remote-tracking branch 'nios2/for-next'