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