the horror!
Merge remote-tracking branch 'upstream/master'
Fixed a bug!