Merge branch 'master' into 3.1.x

Conflicts:
pressforward.php