Ignoring log files
Manual merge from matt/master to kamni/master