WIP
Merge remote-tracking branch 'asvae/master' into asvae-master

(Asvae:master -> lethosor:asvae-master)
Conflicts:
	DFRawFunctions.body.php