Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 02:27:43 PDT 2014