Need activerecord-postgresql-adapter in Gemfile for 264 and 265.
Merge branch 'master' into NS