Merge remote-tracking branch 'origin/TheBearBranch'

Merging the mothafucking branches mofo sumthing...