Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 13:44:15 PDT 2014