Use fixed chokidar fork
Merge branch 'develop' into develop-build