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