Various changes made on flux, not all are necessarily platform independent.
Merge remote-tracking branch 'origin/master' which had new updates.