Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 10:35:34 PDT 2014