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