Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 22:09:38 PDT 2014