Patch for 2.8.12.1 on fx10
Merge remote-tracking branch 'origin/master'