Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 16:48:49 PDT 2014