Figured out a way that works for handling paths. It'll do for now.
Merge branch 'master' into develop