Sync'd branch integration/b2g-inbound with upstream @ Wed Sep  3 03:39:25 PDT 2014