This should get most if not all of the bust/button weirdness.
Merge remote-tracking branch 'upstream/master'