Werk n' shit on FileHandler
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'