Merge branch 'develop' into 005-Node_document_theming
Fix simple warnings.
Merge branch '005-Node_document_theming' into develop