Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 02:33:47 PDT 2014