GoldenFleece 1.2
Merge pull request #11185 from alexnauda/gf12

GoldenFleece 1.2