Sync'd branch integration/fx-team with upstream @ Tue Nov 11 18:12:56 PST 2014