Merge branch 'quoting' into masterwithquoting