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