Merge branch 'master' into texture
Merge branch 'texture' of github.com:christopho/solarus into texture
Merge branch 'texture' of github.com:christopho/solarus into texture
Merge branch 'texture' of github.com:christopho/solarus into texture