Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 06:56:43 PDT 2014