Merge branch 'master' into popl2012