Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 06:27:32 PDT 2014