Created by: Neuheit
Adds the newest changes from the v5 branch to the v4 branch.
We should probably update our contributing guidelines.