Sync'd branch integration/b2g-inbound with upstream @ Mon Oct  6 14:34:43 PDT 2014