Merge commit 'f052d83da064852d4c5301149630f0596ab0febd'
Merge branch 'master' of https://github.com/petitpre/spoon