Update to include required bins

This is just a PR from master (really). Which I'm sure Meatballs could do himself, however doing this means it's in his face when he wakes up :)

As soon as this is landed, I can land his goodness in #3415.

Cheers!