Update to add more memory to nginx process
Merge remote-tracking branch 'origin/master'