Evanxd bug 932605

Don't merge me! I'm just running tests on Travis!