batman/master at #06291de, plus PR677