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