Merge 16216:16355 from trunk.

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

diff --cc app/views/user/view.html.erb
Simple merge

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

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

diff --cc config/routes.rb
Simple merge