Brings some of the fixes in fedora-4/master into master.

Because master's past n builds have failed.  This should get the build passing under Rails 4.1.8 at least.