rc back to master

this is just a PR to use the jenkins tests.