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