Alternative choice logic
Merge master
Merge remote-tracking branch 'origin/master' into alternativechoicelogic
Fix small part of case where leaf element value is ignored
Make a test for mods3.1 from xml file (which is not actually a test, because it doesn't assert anything)