Merge changes required for 1.36 (I think, svn is not being helpful) but stop short of rebuilding the feeds until the docs are up.