Final R1.0 pull

Final pull of R1.0 into master. R1.0 branch will not be developed any longer.