Multi fix from TURFU (b2oba rpz)
Merge origin/master