I've merged the "proposed-plugin-api" branch into "master"