Ensure requiring active_record, fix #1247
Merge pull request #1306 from udzura/patch-2

Ensure requiring active_record, fix #1247
Lock nokogiri to 1.5.9 since it droped support for 1.8
See if 1.5.10 works with PR before merge
Merge pull request #1307 from Ortuna/nokogiri-lock

Lock nokogiri to 1.5.10
Merge remote-tracking branch 'upstream/master' into refresh-admin

* upstream/master:
  See if 1.5.10 works with PR before merge
  Lock nokogiri to 1.5.9 since it droped support for 1.8
  Ensure requiring active_record, fix #1247