bugfix in where statements
Merge branch 'master' into develop