11
Merge remote-tracking branch 'origin/master'
Edit some places. C