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