Merge AddonLoader with Steve's documentation additions