Merge branch 'master' into epoxy

Conflicts:
	flat_input.cpp

diff --cc effect_chain.cpp
Simple merge

diff --cc effect_chain.h
Simple merge

diff --cc effect_chain_test.cpp
Simple merge

diff --cc resource_pool.cpp
Simple merge

diff --cc resource_pool.h
Simple merge