Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 02:03:40 PDT 2014