fix a deadline in masterinfo
Merge branch 'master' into master-sonar