Fix docs and merge master.