Aligning master branch to SVN head for fj-contrib