Fix C++11 build with boost::filesystem enabled
style: else should have bracket on both sides
style: Avoid sizeof(type), use sizeof(var)
Merge branch 'master' into cleanup