Fixed typo in WSN conflict logging
Merge branch 'master' into cachingcodex