Allow listing all available plugin layers
Merge remote-tracking branch 'upstream/master'