Manual merge of updated battle into master.