Merge branch 'eric'

Conflicts:
transforms.md