fixed permissions on undefined properties
Merge remote-tracking branch 'origin/master'