Mongodb smallfiles since the EBS volume is only 1GB
Merge remote-tracking branch 'upstream/master'