Some merging from master.