[asl/f20] (2 commits) ...Update to latest upstream. Fixes problem with quoting.

[Eric Smith]

Summary of changes:

  56ed010... Update to latest upstream Fixed problem buidling on EL6. (*)
  4f70b9b... Update to latest upstream. Fixes problem with quoting. (*)

(*) This commit already existed in another branch; no separate mail sent