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