Get ready for 7.x-1.0-rc1. Applied cumulative patch from #1290404-1. (Fixes issues #1290308, #1290324, #1290354, #1290384, #1390388.)