Took out ... to ../.. conversion, annoying!
Merge branch 'osx' into linux