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