Oups I forgot 2 tables in 1.3's patch...
Merge remote-tracking branch 'origin/1.3.5'