Sync'd branch integration/fx-team with upstream @ Wed Sep 10 06:28:34 PDT 2014