Merge branch 'flat' into 'master'

Add an option to return a flat list

See merge request !23
15 jobs for master in 7 minutes and 56 seconds (queued for 4 seconds)