Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 15:39:39 PDT 2014