Merge branch 'master' into docker-update

Author: thinkingserious

Dockerfile

@@ -10,4 +10,4 @@ RUN apt-get update && \
     apt-get install -y git zip zlib1g-dev && docker-php-ext-install zip
 RUN curl --silent --show-error https://getcomposer.org/installer | php
 
-RUN php composer.phar install
+RUN php composer.phar install