Merge branch 'reset/ath79' into reset/next