Merge branch 'extensional' into 'master'