Proof-read
Merge branch 'master' into officialTag