Merge visionmedia/master