Merge change 2349 into donut

* changes:
  Change the media key algorithm to also ignore double quotes.