fix alternative make problems
Merge remote-tracking branch 'origin/python-wrapper' into python-wrapper
fix merge issue with SHMTVarOpt02.f95