Merge pull request #1266 from arjantijms/4.0.0-M3

Fixing and enhancing FelixPrettyPrinter