Charlock integration

These commits have been sitting here unmerged for ages, anyone know what the state is? @ldodds, @pezholio ?