Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 23:38:47 PDT 2014