Sync'd branch integration/fx-team with upstream @ Wed Sep 17 21:52:41 PDT 2014