Merge remote-tracking branch 'upstream/master'

opponents/ciri/behaviour.xml

opponents/ciri/collectibles.xml

opponents/ciri/editor.xml

opponents/ciri/meta.xml

opponents/hermione/behaviour.xml

opponents/hermione/collectibles.xml

opponents/hermione/editor.xml

opponents/hermione/make_hermione_images.py

opponents/hermione/meta.xml

opponents/hermione/orig/behaviour.xml

opponents/hermione/orig/behaviour_1st.txt

opponents/hermione/orig/meta.xml

opponents/hermione/outdated_hermione_behaviour.txt