catch up to master, also fix docs. fixes #1146