Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	.travis.yml

.travis.yml

@@ -83,6 +83,7 @@ before_script:
  - sudo cat /etc/apache2/sites-available/default
  - sudo /etc/init.d/apache2 restart
  - wget http://localhost/
+ - echo ${APACHE_LOG_DIR}
  - sudo cat /etc/apache2/envvars
  - cat index.html