Merge remote-tracking branch 'origin/master'

This changelog entry has no additional details.