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