Forest conversions
Merge branch 'master' of https://github.com/Darth-Knoppix/WithoutSalt