Nov. branch merge, all files copied from stable