Merge branch 'os_compat_files'
Samuel Kaufman [Fri, 26 Dec 2014 16:56:46 +0000 (16:56 +0000)]

Trivial merge