merge
Merge branch 'master' into consuloTestRunner
#CEP-115 fixed
compilation
Merge branch 'master' into consuloTestRunner
compilation