update references
Merge branch 'master' into v0.97rc