Merge pull request #648 from stweil/alloc