Fixed syntax of null test for #206 fix
Merge branch 'master' into dev