am 18c6afa0: Merge "Also accept non-parenthesized genre numbers"

* commit '18c6afa0c57074e08b8856dde306d3302834b1a9':
  Also accept non-parenthesized genre numbers