Fixed bars. For reals this time. (FML)
Merge remote-tracking branch 'upstream/master'