Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 01:53:40 PDT 2014