removed unnecessary condition for better compatibility
Merge branch 'master' into dev