Branched from master in snipMate.