Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 09:54:55 PDT 2014