Merge remote-tracking branch 'refs/remotes/Cyan4973/dev' into dev

# Conflicts:
#	lib/common/util.h
#	programs/paramgrill.c
#	visual/2013/fullbench/fullbench.vcxproj.filters
#	visual/2013/fuzzer/fuzzer.vcxproj.filters

diff --cc lib/common/fse_decompress.c
Simple merge

diff --cc programs/bench.c
Simple merge

diff --cc programs/dibio.c
Simple merge

diff --cc programs/fileio.c
Simple merge