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