Merged in Aaron's latest changes.
Matching latest .lyx file