Adapted for the new snippet procession logic
Merge remote-tracking branch 'origin/master'