fixes for 61459070
Merge branch 'master' of https://github.com/paul-at-fitsolve/wto-stdf