Merge remote-tracking branch 'origin/master'
18.1 Commit:   cleaning up