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