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