Pressflow 7.33

Cherry-picked changes from Drupal core, 7.32...7.33.

Commands I used to generate this:

```
git clone --recursive git@github.com:mparker17/7.git && cd 7
git checkout master && git pull --rebase
git remote add drupal http://git.drupal.org/project/drupal.git && git fetch drupal
git remote add upstream https://github.com/pressflow/7.git && git fetch upstream
git merge upstream/master && git push origin master
git checkout -b pressflow-7.33
git cherry-pick 7.32...7.33
# Resolved CHANGELOG.txt , includes/bootstrap.inc , ran git cherry-pick --continue
git cherry-pick -m2 b6d84a81aa5ab264076cfccc789915fe98113798
# Resolved CHANGELOG.txt , includes/bootstrap.inc , ran git cherry-pick --continue
git cherry-pick -m2 b4844afdcadbaa7e4f3ad9a237f17126b94dc483
# Resolved CHANGELOG.txt , includes/bootstrap.inc , ran git cherry-pick --continue
git push --set-upstream origin pressflow-7.33
```

Note that b6d84a8 and b6d84a8 were merge commits. I resolved it so the changed files would match the state they were at after the merge commit in Drupal core itself.

Reviews welcome.