Merge pull request #565 from danvk/gulp