(cherry picked from commit 4f54391e)

Conflicts:

	configure.ac
	dynare++/src/Makefile.am
	mex/build/dynare_simul_.am
	mex/build/estimation.am
	mex/build/k_order_perturbation.am
	mex/build/matlab/configure.ac
	mex/build/octave/configure.ac