Merging this should start a package build attempt, we'll need to resolve issues and add repository support for it.