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