Merge branch 'release-0.6'
revert 0.6 last change, empty items should NOT appear as an empty array, but be omitted completely.
Version bumped from 0.6 to 0.7
Merge branch 'release-0.7'