Require 3.1 since 0350495d20.
Merge remote-tracking branch 'upstream/master' into rootpages-pagesort