bb gh merge



Pull request for [bb gh merge](https://trello.com/c/pkU0gunr/1807-bb-gh-merge).

    
I think this should happen as much before the actual push of merged changes, as possible to avoid race condition, but let's assume humans are slow enough