Pull in latest changes from upstream

This includes a Rails version bump to 3.2.17