Merge branch 'master' into 170-license

Author: danielbachhuber

circle.yml

@@ -14,7 +14,7 @@ dependencies:
     # Disable xdebug, which makes Composer slower.
     - echo ""  > /opt/circleci/php/$(phpenv global)/etc/conf.d/xdebug.ini
     # Increase memory limit
-    - echo "memory_limit = 512M" > /opt/circleci/php/$(phpenv global)/etc/conf.d/memory.ini
+    - echo "memory_limit = 1024M" > /opt/circleci/php/$(phpenv global)/etc/conf.d/memory.ini
   override:
     - composer require wp-cli/wp-cli:dev-master
     - composer install