replace [] array init with array() syntax for backward compatibility
Merge remote-tracking branch 'origin/master'