Merge branch 'sy/i18n' into pu

Pat Thoyts committed Oct 3, 2016 at 23:22 UTC 446e2a44d1aa557000b9fce98e8ea14559a5687f

No changes.