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