Merge pull request #283 from stohrendorf/master

Binary-compatible fixes