Port d7 commits to master#239

perusio merged 4 commits intoperusio:masterperusio/drupal-with-nginx:masterfrom

wellebee:port-d7-to-master-1wellebee/drupal-with-nginx:port-d7-to-master-1Copy head branch name to clipboard