FX-147, FX-149, FX-150
Merge branch 'dev' of https://github.com/fix8/fix8 into fixfor_fx-116

Conflicts:
	runtime/session.cpp