prune.php
acp/styles.php
Merge remote-tracking branch 'origin/3.1' into 3.1

* origin/3.1:
  A few missing FAQs
  Missing phrases in search