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