Merge branch 'master' into implicit

Conflicts:
	leap/method/rk/imex.py
	leap/vm/codegen/utils.py
	leap/vm/exec_numpy.py
	leap/vm/language.py
	test/test_codegen.py
	test/test_codegen_python.py
	test/test_multirate.py