Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 00:48:46 PDT 2014