Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 20:01:43 PDT 2014