Merge master branch

Mind you! This is a big one. This is merging all changes to master that happened since we split off bb-development.