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