Rebase better-articles

Emily DECHERrequested to merge
master into better-articles

If we want better articles, at least get the latest versions.

Merge request reports