Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 16:53:36 PDT 2014