Merge with some changes that has been conducted this week

Still 2 more errors on IOFactoryTest.php but I think it's better that you merge this. The changes that put back are documentation changes and 1 bug fix.