Merge pull request #24 from y-higuchi/RAMCloud-yoshi

Prep to backport