Merge remote-tracking branch 'remotes/rth/tags/pull-nios-20170124' into staging