Don't assume the `PATH` env var is set
Merge branch '2014.7' into develop