Commit from Mozilla Verbatim by user auzelac91.: 1421 of 4985 strings translated (114 fuzzy).
Remove paypal-disable from mkt waffles
Commit from Mozilla Verbatim by user gialloporpora.: 4985 of 4985 strings translated (0 fuzzy).
Merge branch 'master' of ssh://github.com/mozilla/zamboni
Commit from Mozilla Verbatim by user gialloporpora.: 4985 of 4985 strings translated (0 fuzzy).
Merge pull request #1693 from diox/api-customer-info-endpoint

Add API endpoint returning consumer information (bug 964524)
remove unused waffles

close #1691
log the traceback for videos; bug 928242
Add back privacy policy to fireplace fields (bug 945820)