Partial 2.1.4 update

There are also changes to the form Hungary decision, the form Hungary
event, and the ruler designer defines, but all of those are above my pay
grade