Merge branch 'master' into hints-name-order

... to fix conflict in NEWS.
5 jobs for hints-name-order
in 1 minute and 4 seconds and was queued for 0 seconds