Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  9 09:03:44 PDT 2014