Sync'd branch integration/fx-team with upstream @ Wed Sep 17 17:34:38 PDT 2014