Merging to live.  Fixes translations and routing.