Pushed most recent lambda edits to master.
Resolved conflict in lambda-defs.txt