Merge gulp branch.