merge dev into master

maintenance station, among other things