Sync'd branch integration/b2g-inbound with upstream @ Thu Oct  2 08:43:41 PDT 2014