snippet-edit 20140422
Merge pull request #6763 from vitorgalvao/fix-6760

snippet-edit 20140422