Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 20:13:56 PDT 2014