Merge branch 'upstream'

Integrate from SVN upstream, version 1396.

All conflicts resolved by hand.

Conflicts:
	src/libprojectM/MilkdropPresetFactory/BuiltinFuncs.hpp
	src/libprojectM/MilkdropPresetFactory/Expr.cpp
	src/libprojectM/Renderer/Renderer.cpp
	src/libprojectM/config.inp.in
	src/libprojectM/projectM.cpp