Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 23 08:03:57 PDT 2014