a
Merge branch 'master' of github.com:ALoppukaarre/fnx-cyril2

Conflicts:
	test/target/stacktrace.log
Test merge
Merge branch 'master' of github.com:ALoppukaarre/fnx-cyril2
Merge branch 'master' of github.com:ALoppukaarre/fnx-cyril2
food edited