Update history.

Closes #371
Merge branch 'master' into new-core