Merge pull request #3560 from Mloc/master

More dismemberment fixes
Removes alien virus.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>