Merge from branch 2.20 to tag 2.20.2 for publication : - Bug 2256 fixed : Error on upgrade from 2.20.0 to 2.20.1