Fix comments
Merge branch 'source' into i18n