Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 01:34:35 PDT 2014