6.0 Release Candiate

New Baseline of the addon, Almost every pull request was manually done
against this baseline. If one was missed I apologize.