Merge branch '3.x' into mantamatcher.org
Merge remote-tracking branch 'refs/remotes/origin/mantamatcher.org' into mantamatcher.org