Sync'd branch integration/fx-team with upstream @ Tue Oct 28 04:31:45 PDT 2014