Merge branch 'work' of https://github.com/Neraste/dakara into work