bugfix
Merge branch 'bvsls' of https://git01.codeplex.com/z3 into opt