1.x-1.0.0-rc

Port from Drupal 7.x-1.0-rc1 plus the commits in the dev branch there. Also:

• #1 - Fix cookie check failing in some environments