Opinion modifier overrides
Free Investiture hormone therapy
opinion_rightful_rel_head +15 (readjusting)
Import vanilla 2.1.6 imprisoned_events.txt
Import PB 3.5.12 waylit_siege_events.txt
Deferral of waylit-induced prisoner mercy request spam
Merge branch 'beta' into obj_win_war

Conflicts:
	EMF/common/event_modifiers/emf_timers.txt
Fix file permissions
Import PB 3.5.12 muslim_county_conquest_religious
Victory timers added to all CBs (both victory and holy_victory)