Merge "Developer-guide.rst"