Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 16:33:51 PDT 2014