update master with stable5 changes

this pulls in changes from @DeepDiver1975 and me to stable5