as per akatakritos from twitter
merge upstream