Merge 16355:16480 from trunk.

diff --cc app/views/layouts/site.html.erb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/sl.yml
Simple merge

diff --cc config/locales/vi.yml
Simple merge

diff --cc config/routes.rb
Simple merge