Fix analysis save and save as
Merge branch 'develop' of github.com:gitools/gitools into develop