Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 20:58:42 PDT 2014