Merge pull request #423 from hflynn/agent_fix

Fixes from Petr
Merge pull request #424 from ximenesuk/dropbox-update

Dropbox page update
merge dev_4_4 -D org -I include -E exclude: PR 368 (Cpp: Correct content and markup)