Merge branch 'master' into call-cc