Floppy/such-travis — pull request #2 by forkbot (2013-12-17 15:06:35+00:00)
Title: Upstream changes

Automatically opened by http://forkbomb.io