less strict about ansi libraries, less warnings
Merge remote-tracking branch 'upstream/master'