More lambda clean-up.
ce
Merge branch 'master' into ospalh-special

Conflicts:
	Quick note and deck buttons.py