Merged changes from logentries/master.