fix misuse of ==
Merge branch 'master' into devel