Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 16 20:38:48 PDT 2014