Changed periodic server notification interval to 5-10 minutes
Merge remote-tracking branch 'github/master'