Update align, circular_buffer from master.