Pull request/a1062c4a

This pulls in fixes for Julia 0.3 and Julia 0.4.