some other fixes
Merge branch 'upstream' into 331-bootstrap-carousel

* upstream:
  some other fixes