Delay when saving settings decreased to 3 seconds.
Merge remote master