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