Merged 3.11/sprint over 4.0/sprint.
Some Makefile conflicts solved, with trivial versions numbers, etc.