Make clean urls work with virtualdocumentroot
Drupal 7.32 upgrade
Merge remote-tracking branch 'server/master'