Merge branch 'master' of git://git.code.sf.net/p/foam-extend/foam-extend-3.2