Sync'd branch integration/b2g-inbound with upstream @ Thu Sep  4 15:03:37 PDT 2014