Hello Ian,

sorry, I was off the radar for a couple days when travelling to Canada
(wifi on the dog-sleds was limited :-) ).

These should be included in the release branch since they are required
to make things compile on the different machines. Sorry I forgot to
lobby for them and apparently they were missed.

Since this is simfactory and only the option lists I think they should
still be able to be applied to the release branches.