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