Merge branch 'master' into script_devel updating progress in pycompare