reformatted all code (using perltidy -i=2 -l=100 -vmll -pt=2 -sbt=2 -nbbc -blbs -ndnl -nanl); untabify everywhere to avoid spurious diffs
Merge remote branch 'upstream/master'