Merge pull request #1866 from saper/libc7