Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 27 17:42:45 PDT 2014