Merge branch 'master' into stable
Conflicts: distrib/autobuild.py distrib/builder/changes.py doomsday/build/build.pro doomsday/build/mac/Info.plist doomsday/config.pri doomsday/engine/engine.pro doomsday/engine/portable/include/dd_version.h doomsday/engine/portable/src/p_particle.c doomsday/engine/portable/src/sys_opengl.c doomsday/engine/portable/src/ui2_main.c
Merge branch 'master' into stable
Conflicts:
distrib/autobuild.py
distrib/builder/changes.py
doomsday/build/build.pro
doomsday/build/mac/Info.plist
doomsday/config.pri
doomsday/engine/engine.pro
doomsday/engine/portable/include/dd_version.h
doomsday/engine/portable/src/p_particle.c
doomsday/engine/portable/src/sys_opengl.c
doomsday/engine/portable/src/ui2_main.c