improving robustness (and bug hunting)
Merge remote-tracking branch 'upstream/master'
adjust path
removed until we work on curtiss - find the file in savannah attached to ticket https://savannah.gnu.org/bugs/index.php?43266