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