Merging 1.x into master

Is master really this far behind?