merge waffle-iron badge update