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