Floppy/such-travis — pull request #7 by forkbot (2013-12-17 15:27:24+00:00)
Title: Upstream changes

Automatically opened by http://forkbomb.io