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