rebuild

this should be merged into master as it's the current primary branch.

any objections?