Merge branch 'master', remote-tracking branch 'upstream/master'
backing up, started test_Amoeba.dats
Merge remote-tracking branch 'origin/develop'
minorly updating
merging changes from upstream
Merge remote-tracking branch 'upstream/master'
minor fix for building patscc
Updating: additions/modifications by BB