Merge commits from AndreaCrotti/yasnippet-snippets