1 conflicts left behind
Merge branch 'master' into tests
all unit test for -init- lib pushed