Merge branch 'master' into mapdata-c++
Conflicts:doomsday/client/src/client/cl_sound.cppdoomsday/client/src/map/p_particle.cpp
Merge branch 'master' into mapdata-c++
Conflicts:
doomsday/client/src/client/cl_sound.cpp
doomsday/client/src/map/p_particle.cpp