Remove an obsolete symlink
Fix symlink file
Merge remote-tracking branch 'origin/master'
Several fixes for J! 3.1
2b continued..