bb t next



Pull request for [bb t next](https://trello.com/c/7b4Z3V8o/1803-bb-t-next).

    
I am aware this points to the bad structuring of the git(hub) modules — will be fixed at some point ;)