Merge up

@BrettASwift Can you merge up to master if it's safe (and let Mark know when you do)?