Remy Maucherat
committed
on 29 Mar 16
BZ1318006: Port fix for file conditions.