Update modules for file_t merge into unlabeled_t.
Merge remote-tracking branch 'upstream/master' into contrib