dev/core#4633 (closed)
would be good to tag a release with this
the other commit is just a random cleanup