Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 20:03:43 PDT 2014