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