Merge branch 'master' into private

Conflicts:
	src/mpc-hc/mplayerc.rc