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