Change hardcoded default to 20s.
Merge pull request #96 from xschildw/master

PLFM-1479
Merge branch 'release-1.7'
Merge branch 'release-1.12'
updated README.md
merge from upstream