Applied feature #3375 and fix of pull 1842 to avoid merging problems later
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation