Updated with changes from DRUPAL-7-0-ALPHA7, fixed #911182 #917404 and #919428. Added dependency on Autoload-2.x