Only splat scope args if they are an array
Merge branch 'tinderfields-master'