Mustache helper fix to ensure full list returned.
Merge remote-tracking branch 'origin/release/0.9a22' into develop