Merge the 3.4.5rc1 tag all the way into default (3.6).
1 file changed