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