better handling for #477
Merge remote-tracking branch 'origin/master'