Merge branch 'master' of github.com:synfig/synfig
Merge branch 'master' into eldruin_etl_replacement