Merged master (it was a lot).