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