The feature and release branches will need merging up from 1.5.0 into 1.6.0
The feature and release branches will need merging up from 1.5.0 into 1.6.0