there's a failure in travis after merging that, i left a message in #releases, not sure if i should revert it