This change looks fine. All others (save for the travis notifications) should be removed from this pull request.

Also, do we have tests that verify this change?