Ignore .so files.
Merge branch 'upstream'