Issue #1864490 by laurent_ : bad declaration of the custom theming functions
Issue #1865998 by José San Martin: Variables in page.tpl.php should be enclosed in !empty()
Issue #1864450 by nrm604 : chang cdn urls so works with https
Merge branch '7.x-2.x' of git.drupal.org:project/bootstrap into 7.x-2.x
Removing duplicated version line from bootstrap.info
Merge branch '7.x-2.x' of github.com:natted/bootstrap
Merge branch 'master' of github.com:nesi/nesi-webportal