Merge upstream changes.
Develop is from now on obsolete and will be deleted. We will stick to the branchy model used in VTK and ParaView. @demarle
Develop is from now on obsolete and will be deleted. We will stick to the branchy model used in VTK and ParaView. @demarle