Merge branch 'master' into pldi13