Merge branch 'master' into svnsync

git-svn-id: svn+ssh://svn.code.sf.net/p/elmerfem/code/trunk@6531 04224531-1f84-46d8-96ce-875b9e37dce3