'git am'able fix attached, let me know if you'd like me to build and push this for devel. Build tested and lightly runtime tested locally on F-20, fixes #1062941 for me.
Created attachment 883257 [details] Update to 3.10.2
Done and bumped to 3.12.0 with minor changes while at it due to no feedback.