Merge change I88d11cfb into eclair

* changes:
  one step towards fixing [2071412] work around mdp 32-bits fade limitation