Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 09:44:36 PDT 2014