Merge: Resolved conflicts.

Merged all recent updates from Mad's `master` branch.