Homestyx hydra

R1:336ccfeea12e

Revert a fourth json_decode() which decodes possible scalars

See D12714, D12680.

Auditors: joshuaspence
Repository: R1 hydra
Commit Date: May 5 2015