Sync'd branch integration/b2g-inbound with upstream @ Mon Oct 20 18:34:47 PDT 2014