Merged master back in.

1 job for logatom in 7 minutes and 31 seconds (queued for 15 seconds)