fix non-fixed merge (thx pol)
Merge branch 'master' into Zoom