now working on 3.6.15
docs; add note to model.update

closes #571
Merge branch '3.6.x' into gh-pages
website; regen