Merge 1.9.3-p392 RailsExpress patch into Stable. Closes #1656.