Merge branch 'cf'
Merge branch 'cf'
update bst to have '.' after et al
Merge branch 'master' into cf