Merge branch 'jmac/virtual_directories' into juerg/googlecas