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