fix for 1264
Merge branch 'Testing_Release_1.0' of local repository into eliza_testing_1.0