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