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