Merged master into oolite-1.77.1
more commits from the merge of master to oolite-1.77.1