am 56505fe6: Merge "Fix bad variable expansion"

* commit '56505fe67e709d2ec17feff882229e781ff8589d':
  Fix bad variable expansion