Small fix for parse_ipv4

Still problems on 32bit due to issues discussed in #3447
Merge branch 'master' of github.com:JuliaLang/julia
fix base_module_conflict flag
Merge branch 'master' of github.com:JuliaLang/julia