Merge branch 'master' into ph/strbuf