Pull request/1ac11c28

Tracking Julia 0.4 changes