Implement Issue #514
Merge pull request #515 from acinelli/topic_cron_fix_authtimeout

Implement Issue #514