Merge branch 'hotfix/1.18.17' into stable
Merge 1.9.3-p392 RailsExpress patch into Stable. Closes #1656.
Just merge all the patches and patch sets.
1.18.18
Merge branch 'hotfix/1.18.18'