Le petit merge.
Merge branch 'impact' of github.com:pushmatrix/ninjasamurai into impact
Fix strange merge conflict
Merge branch 'impact' of github.com:pushmatrix/ninjasamurai into impact