merge git and svn versions
Synchronized with latest gdat svn, ran the default script test_script.sh matlab850 all passed So can merge back
Synchronized with latest gdat svn, ran the default script test_script.sh matlab850 all passed So can merge back