Merge remote-tracking branch 'refs/remotes/dev.rainulf.ca/master' into master-2
Merge remote-tracking branch 'refs/remotes/origin/master' into master-2
Minor changes.
Merge branch 'refs/heads/master-2'