Merge branch 'rivers'