Gulp: Fix common mistakes
Merge branch 'Tombek-master'