Pull request/99d487ef

We can offer the new stuff to Julia `0.2-` as well.