Merge branch 'extra_tree_dir' into 'master'

ENH: look for sub-trees in parent tree directory

See merge request fsl/fslpy!155
7 jobs for master in 19 minutes and 41 seconds (queued for 4 seconds)