Updates from latest drupal-bootstrap version