Merge remote-tracking branch 'origin/master'
[Ronald] fix some spelling mistakes and add extra info about the DefaultBatchConfigurer