Merge across 0.11.x changes to the changelog