Merge branch 'master' into jaccou_n
Merge branch 'jaccou_n'
Merge remote-tracking branch 'origin/master' into jaccou_n
Merge branch 'master' of https://github.com/larpomatic/gnk into jaccou_n
Come back code delete
Merge remote-tracking branch 'origin/jaccou_n'