Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 07:48:21 PDT 2014