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