Merge branch 'nkwork' into 'master'

Return properties with no options to matching without an option

See merge request !24
3 jobs for master in 1 minute and 17 seconds (queued for 3 seconds)
latest