Sync'd branch integration/fx-team with upstream @ Wed Sep 24 21:21:39 PDT 2014