Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 17:34:41 PDT 2014