Dumbfuck + Dr. B
Merge remote-tracking branch 'upstream/master'