Merging in 62

@ScotterC: Can you review this? 

I think I merged in @jebw's stuff correctly, but I'm uncertain.