Merge updates from DirtyRasa's fork

Includes support up to and including the latest 5.0.15.0 Beta.