resync

Pregmodderrequested to merge
Pregmodder/fc-pregmod:pregmod-dev into pregmod-master

Includes half-finished 4.A.0 stuff that hopefully won't cause trouble.

Merge request reports