A bit more logging
Merge branch 'develop'