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