Merge remote-tracking branch 'upstream/master' into chinese
CN Translation: looping.po first draft
CN Translation: indexing.po fixed
CN Translation: updated *.po
CN Translation: package.po first draft
CN Translation: organizing.po first draft
CN Translation: fqn.po first draft
CN Translation: importing.po first draft
Merge branch 'chinese' into chinese-integration

First 2 Sections from chapter package