Merge tag '7.66' into 'devel'
Merge branch 'trunk' into 'devel'