Fix #1544 : Upgrade data from 3.5 does not work
Merge pull request #743 from romainneutron/fix-1544

[3.8] Fix #1544 : Upgrade data from 3.5 does not work