Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 04:34:07 PDT 2014