Fixed bug with static file server crashing when directory requested.
Merge remote-tracking branch 'origin/master'