Nalanda prerelease into release

(Since these are important, and low-risk, bug fixes -- merging just in case teachers are updating mid-week)