Pull hotfixes and outstanding master code into nalanda-rct.