Improve Ubuntu 14.04 compatibility.
Merge pull request #209 from bryantraywick/fix-ubuntu-14.04-compatibility

Improve Ubuntu 14.04 compatibility.