Merge branch 'eldruin_master' of ssh://synfig.git.sourceforge.net/gitroot/synfig...