Editing about block
Merge branch 'master' into Slave