Merge with trunk revision 20991, and update scripts for the changes too. Reload Scripts and Export OBJ still work for me.