Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 02:20:47 PDT 2014