Merge branch 'tj/maint-properly-escape' into next