Attribute autocomplete $json declared twice
Merge remote-tracking branch 'opencart-ce/master'