Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 14:08:33 PDT 2014