Merged r9346 and r9347 from trunk.
Adds a note about Gemfile.local in the INSTALL doc.
Load Gemfile.local if present.
Merged r9343 from trunk
Simplified Chinese translation updated by fangzheng (#10611)
Merged r9341 from trunk.
Do not install rmagick gem with jruby.
Merged r9339 from trunk.
Typo in database rake task.