The merge accidentally omitted the 10.4 commit 472b35c7 and reverted the 10.5 commit 6e3bd663.
Attach a file by drag & drop or click to upload
