a change suggested by Marcelo
Merge remote-tracking branch 'ba/master'