Merge pre-1.20.5 changes from next-release (more OS/2-related stuff)

This commit is contained in:
Jeff Parsons 2016-01-21 12:01:56 -08:00
commit e08104893d
13 changed files with 1489 additions and 33 deletions

File diff suppressed because it is too large Load diff