Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 20:35:36 PDT 2014