Public release

Final merge (hopefully) to master, for the public release.