more peer review preparations
Merge remote-tracking branch 'origin/master'