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