Merge remote-tracking branch 'upstream/master'

Fix syntax error in showLeaveAfterCount and add this.leaveAfterCount >=
0 in constructor.  Checking if it’s true doesn’t cover the “is 0” case.