Added max_content_mb setting
Merge remote-tracking branch 'origin/master'