Sync'd branch integration/fx-team with upstream @ Wed Sep 17 00:43:39 PDT 2014