Update history, regenerate docs.
Merge branch 'develop'