merged in changes from Quest repository, unittests-2013-11-13 branch
merged in changes from Quest repository, unittests-2013-11-13 branch, part 2