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