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