Merge pull request #693 from abhinavc/master

new question + conflicts resolved
[cron-git-commit] @ 12.03
[cron-git-commit] @ 12.22
new question