Directories can be removed, too.
Merge branch 'master' into NET_40