JSONExpand + master merge

Merge of `master` and `JSONExpand`.