Sync'd branch integration/fx-team with upstream @ Wed Sep 10 04:09:39 PDT 2014