Clarify the meaning of a manually entered ACC ping time limit.
Merge remote-tracking branch 'cappiewu/master'