Continued logging
Merge branch '1.3.5'