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