Fixed some inline documentation.
Merge branch 'refs/heads/3.3/develop' into 3.3/master