Fix light issue in 6d facedir.
Merge remote-tracking branch 'upstream/master' into weather