5.x

Chris Shantzrequested to merge
5.x into 5.x-dev

Update 5.x-dev with changes from 5.x so both match.

Merge request reports