Renamed 'resolve_wildcards' to 'glob'.
Merge remote-tracking branch 'origin/master'. Not that there are any actual changes, but git is beging retarded as ususal.