Merge branch 'develop' into staging

* develop:
  increase php memory limit to 2G

Dockerfile

@@ -94,7 +94,7 @@ ENV client_max_body_size=2M \
     max_execution_time=0 \
     max_input_time=-1 \
     max_input_vars=1000 \
-    memory_limit=512M \
+    memory_limit=2G \
     post_max_size=8M \
     upload_max_filesize=2M \
     zlib.output_compression=On