Sync'd branch integration/b2g-inbound with upstream @ Thu Oct 30 14:28:47 PDT 2014